From 7a8f483f462266b0bb0813a3a816cac27910c833 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 6 Oct 2014 15:45:51 +0200
Subject: [PATCH] Revert "x86/vlapic: don't silently accept bad vectors" - it
 appears to cause reboot issues for Win7 guests.

This reverts commit 0a43c50cb0c55d2f770b69d9452c994d9f2cdd84.
---
 xen/arch/x86/hvm/vlapic.c        | 38 +-------------------------------
 xen/include/asm-x86/hvm/vlapic.h |  1 -
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index 388e656baf..99ae1be00b 100644
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -123,34 +123,10 @@ static int vlapic_find_highest_irr(struct vlapic *vlapic)
     return vlapic_find_highest_vector(&vlapic->regs->data[APIC_IRR]);
 }
 
-static void vlapic_error(struct vlapic *vlapic, unsigned int errmask)
-{
-    unsigned long flags;
-    uint32_t esr;
-
-    spin_lock_irqsave(&vlapic->esr_lock, flags);
-    esr = vlapic_get_reg(vlapic, APIC_ESR);
-    if ( (esr & errmask) != errmask )
-    {
-        uint32_t lvterr = vlapic_get_reg(vlapic, APIC_LVTERR);
-
-        vlapic_set_reg(vlapic, APIC_ESR, esr | errmask);
-        if ( !(lvterr & APIC_LVT_MASKED) )
-            vlapic_set_irq(vlapic, lvterr & APIC_VECTOR_MASK, 0);
-    }
-    spin_unlock_irqrestore(&vlapic->esr_lock, flags);
-}
-
 void vlapic_set_irq(struct vlapic *vlapic, uint8_t vec, uint8_t trig)
 {
     struct vcpu *target = vlapic_vcpu(vlapic);
 
-    if ( unlikely(vec < 16) )
-    {
-        vlapic_error(vlapic, APIC_ESR_RECVILL);
-        return;
-    }
-
     if ( trig )
         vlapic_set_vector(vec, &vlapic->regs->data[APIC_TMR]);
 
@@ -484,12 +460,7 @@ void vlapic_ipi(
         struct vlapic *target = vlapic_lowest_prio(
             vlapic_domain(vlapic), vlapic, short_hand, dest, dest_mode);
         if ( target != NULL )
-        {
-            if ( likely((icr_low & APIC_VECTOR_MASK) >= 16) )
-                vlapic_accept_irq(vlapic_vcpu(target), icr_low);
-            else
-                vlapic_error(vlapic, APIC_ESR_SENDILL);
-        }
+            vlapic_accept_irq(vlapic_vcpu(target), icr_low);
         break;
     }
 
@@ -497,11 +468,6 @@ void vlapic_ipi(
         struct vcpu *v;
         bool_t batch = is_multicast_dest(vlapic, short_hand, dest, dest_mode);
 
-        if ( unlikely((icr_low & APIC_VECTOR_MASK) < 16) )
-        {
-            vlapic_error(vlapic, APIC_ESR_SENDILL);
-            break;
-        }
         if ( batch )
             cpu_raise_softirq_batch_begin();
         for_each_vcpu ( vlapic_domain(vlapic), v )
@@ -1438,8 +1404,6 @@ int vlapic_init(struct vcpu *v)
     if ( v->vcpu_id == 0 )
         vlapic->hw.apic_base_msr |= MSR_IA32_APICBASE_BSP;
 
-    spin_lock_init(&vlapic->esr_lock);
-
     tasklet_init(&vlapic->init_sipi.tasklet,
                  vlapic_init_sipi_action,
                  (unsigned long)v);
diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h
index 16752b5195..bf59b9594c 100644
--- a/xen/include/asm-x86/hvm/vlapic.h
+++ b/xen/include/asm-x86/hvm/vlapic.h
@@ -77,7 +77,6 @@ struct vlapic {
         bool_t               hw, regs;
         uint32_t             id, ldr;
     }                        loaded;
-    spinlock_t               esr_lock;
     struct periodic_time     pt;
     s_time_t                 timer_last_update;
     struct page_info         *regs_page;
-- 
2.30.2